be more protective about when we install properties

diff --git a/modules/engines/ms-windows/ChangeLog.old b/modules/engines/ms-windows/ChangeLog.old
index 87017ad61411bc6a07ef3b0cc3f29bd57747e3de..dce1818e1df121b0a35b0919064446e5f3d0b71b 100755 (executable)
--- a/modules/engines/ms-windows/ChangeLog.old
+++ b/modules/engines/ms-windows/ChangeLog.old
@@ -1,3 +1,8 @@
+2003-10-01  Dom Lachowicz <cinamod@hotmail.com>\r
+\r
+       * src/wimp_style.c: Only set the delays if the param is installed. Silly gtk - \r
+       installing those 3 params only in the menus...\r
+\r
 2003-09-25  Dom Lachowicz <cinamod@hotmail.com>\r
 \r
        * src/wimp_style.c: Set a delay on popdown menus\r

diff --git a/modules/engines/ms-windows/wimp_style.c b/modules/engines/ms-windows/wimp_style.c
index 277be997330bd6dd1bcab04ff458c82e93e0b643..f60b227fa0000cb2bdc13928ebdd17dec790e21c 100755 (executable)
--- a/modules/engines/ms-windows/wimp_style.c
+++ b/modules/engines/ms-windows/wimp_style.c
@@ -252,12 +252,22 @@ setup_system_settings (GtkStyle * style)
 
   if (!win95) {
     if (SystemParametersInfo (SPI_GETMENUSHOWDELAY, 0, &menu_delay, 0)) {
-      g_object_set (G_OBJECT (settings), "gtk-menu-popup-delay",
-                   0, NULL);
-      g_object_set (G_OBJECT (settings), "gtk-menu-popdown-delay",
-                   menu_delay, NULL);
-      g_object_set (G_OBJECT (settings), "gtk-menu-popup-delay",
-                   menu_delay, NULL);
+         GObjectClass * klazz = G_OBJECT_GET_CLASS(G_OBJECT(settings));
+
+         if (klazz) {
+               if (g_object_class_find_property (klazz, "gtk-menu-bar-popup-delay")) {
+             g_object_set (G_OBJECT (settings), "gtk-menu-bar-popup-delay",
+                                           0, NULL);
+               }
+               if (g_object_class_find_property (klazz, "gtk-menu-popup-delay")) {
+             g_object_set (G_OBJECT (settings), "gtk-menu-popup-delay",
+                                           menu_delay, NULL);
+               }
+               if (g_object_class_find_property (klazz, "gtk-menu-popdown-delay")) {
+             g_object_set (G_OBJECT (settings), "gtk-menu-popdown-delay",
+                                           menu_delay, NULL);
+               }
+         }
     }
   }
 
@@ -268,6 +278,7 @@ setup_system_settings (GtkStyle * style)
 
   g_object_set (G_OBJECT (settings), "gtk-icon-sizes",
                "gtk-menu=10,10 : gtk-button=16,16 : gtk-small-toolbar=16,16 : gtk-large-toolbar=16,16 : gtk-dialog=32,32 : gtk-dnd=32,32", NULL);
+
 #endif
 
   /*